[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 am: 274a0ec2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I35600cc3be9434b32a42b3adf091186282901fff