[automerger skipped] Merge "[DO NOT MERGE] Lockscreen/Shade upscaling" into...

[automerger skipped] Merge "[DO NOT MERGE] Lockscreen/Shade upscaling" into tm-dev am: 7119cb7f am: b5843953 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia8574f6d8b6f8c5c647215551304526a5ab7369a