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: Icdea6a95e9ba59863b932755e85930a501526309