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

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

am skip reason: subject contains skip directive

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

Change-Id: Ic51e52f509375d87ec5e49d6a17642c0478c8352