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

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

Change-Id: Iabd5acad55be6c0d9b84c43b25317c5e977e95d3