Merge "Ensure attributes for using Toolbar are in Settings theme despite OEM overlays." into sc-dev am: 4d34ed3eb2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/15486610

Change-Id: I5311200327a344c13707ac692989c3aa8bccea7a