[automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 am: 25d1e643ec -s ours am: f289bf2d8b -s ours

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

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

Change-Id: I3a5040f1ab0cfd3c534619b741387b9547af6b9a