Merge "Merge "Fix settings gear visibility" into sc-dev am: 32fe72cf am:...

Merge "Merge "Fix settings gear visibility" into sc-dev am: 32fe72cf am: 4683bd40" into sc-v2-dev-plus-aosp am: 4085a4cd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15095286

Change-Id: I724ec6af6af4842ace0315362ff9d3b07a817ede