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: a265d6fd am: fb620a95 am: 4ae7905c

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

Change-Id: I7f76ebdc3ad29de8b9ac55055c2cf97265ef4b4d