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

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

Change-Id: I43757dc5ee9a29d399f2841a3f09e082b54cf23e