Merge "Fix advanced icon will incorrect when change display size" into rvc-dev am: 7e751a08 am: 78d6c125 am: bbda4540 am: 65df7159

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

Change-Id: I6d4a7e2ea29e6d80ac9ef9b942235836b9df4fca