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

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

Change-Id: Id9280fb10cc19c6ac5acd4b729b6ccc6a6321c34