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