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

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

Change-Id: I49371f11565a485d94fb2972ccc316cdf0ddb709