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