Merge "Fix advanced icon will incorrect on some device" into rvc-dev am:...

Merge "Fix advanced icon will incorrect on some device" into rvc-dev am: 40bdc176 am: 8494fdb1 am: 94ac1986 am: 5d3316d5

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

Change-Id: I757177b83aea4a74b234e1344fbef03d1c81433b