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

[automerger skipped] Merge "Fix NPE on getTitle()" into rvc-qpr-dev am: f25ee59f -s ours am: 1d814e9b -s ours am: 7f787b6b -s ours am: 5c3c912a -s ours am: 9dd3cca1 -s ours

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

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

Change-Id: Ic32909aad7b746823cc9e65201308e9792774d66