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: 1526bd29

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

Change-Id: I40ddc5a34fce8f8dd8f2f6c5cf48b9d1d67e24f0