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

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

Change-Id: I7ab2b94bf85f42980c5f94987ba94e2d066d826f