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: I186cc674ddc24ba1046d504a6b06abe843ab5bb2