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: 78d6c125 am: 57c0dee5

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

Change-Id: I537c55f05bee79af13fdf21b7faac472d2396478