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

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

Change-Id: I134aee68a976cec1c48e28d0e588c91be1c60c94