Merge "Create settings activity layout with explicit toolbar" into sc-dev am: d9463fbfdd am: 25bf26ff4d am: ac24ef0c18

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14738956

Change-Id: I4a21d8fa6ee75317b25fc84136172e874351e874