Merge "Fix advanced icon will incorrect when change display size" into rvc-dev am: 7e751a08

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

Change-Id: I35905b18f51362195d8214e7a57fa871a66371bf