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

Merge "Merge "Fix advanced icon will incorrect on some device" into rvc-dev am: 40bdc176 am: 8494fdb1 am: 1526bd29" into rvc-qpr-dev-plus-aosp am: 2e15aeff

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

Change-Id: I158b642ae679e196b099eb3c8aa0e16ffef58b95