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: e30ae20f -s ours am: 22e16824 -s ours am: be939971 -s ours am: 9cbe7b23 -s ours" into sc-v2-dev-plus-aosp am: 6c94b001 -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: I78cdd870be3259146224f86a4c145748824ddd48