[automerger skipped] Merge "Add subtitle to settings (settings)" into udc-dev am: 853c4a8683
am: 241b14fd9b
-s ours
am skip reason: Merged-In I481da16985027a49ee464623b6db166d941cab55 with SHA-1 6474e01372
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911122
Change-Id: Idba1c0b6402447faf3f2913254a914d2fe4c0b3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: