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 am: f3b15841

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

Change-Id: I7f0d15f267f2ebd9b49d966664c0c6808db44190