[automerger skipped] Merge "RESTRICT AUTOMERGE: Update QS rotation tile text...

[automerger skipped] Merge "RESTRICT AUTOMERGE: Update QS rotation tile text to display when smart-auto-rotate is enabled" into sc-qpr1-dev am: 50d61baf -s ours am: 99007bca -s ours am: 63623f34 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I262be2b1a5f44c0b77144ddcc3214a1129c521a1