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

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

Change-Id: I26c09f9a1da137cc194a0215d085ffc4fa09a4f0