Merge "Fix settings gear visibility" into sc-dev am: 32fe72cfb9 am: 1deebe4097 am: 03c3a505ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15095286 Change-Id: I353a6dbafbadb0bdeac516b9d86675b07e41fbe4
This commit is contained in: