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

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

Change-Id: Id69b2e8cc567d1efa951519f240b39d34184ae5f