Merge "Fix advanced icon will incorrect on some device" into rvc-dev am: 40bdc176e1 am: 8494fdb10a am: 1526bd291b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862404 Change-Id: I40ddc5a34fce8f8dd8f2f6c5cf48b9d1d67e24f0
This commit is contained in: