Merge "Fix advanced icon will incorrect when change display size" into rvc-dev...

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

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

Change-Id: I2079d33a6158027809324164bbfd724e236502d3