[automerger skipped] Merge "Add getTitle() for ButtonPreference" into...

[automerger skipped] Merge "Add getTitle() for ButtonPreference" into tm-qpr-dev am: f568c59b am: 40274bf8 -s ours

am skip reason: Merged-In Ie2f24879bce026e5bc3d7fedfcb3a6475ab7d404 with SHA-1 fa6acf36 is already in history

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



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