Merge "[automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am:...

Merge "[automerger skipped] Merge "Fix NPE on getTitle()" into qt-dev am: afee5a72 am: 72c56e2c -s ours am: b1cc7299 -s ours am: 7190d9a4 -s ours am: 45eda655 -s ours am: 42444158 -s ours am: cfe920a5 -s ours" into sc-v2-dev-plus-aosp am: 58091ed3 -s ours

am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 ced3af1e is already in history

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

Change-Id: Id0ad4334a323efa4a63e8f9f511eb193b0175a6b