[automerger skipped] Merge "Change title to aspect ratio (experimental)" into...

[automerger skipped] Merge "Change title to aspect ratio (experimental)" into udc-qpr-dev am: f1c7bf34 am: 12867d5a -s ours

am skip reason: Merged-In I359c744025232c6a6ebd9628dbf91acac85b53e9 with SHA-1 ac2bfce1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24799914



Change-Id: If4273026f2e9ef2ecaeaecfc9edb0552320bb20a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>