[automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55 -s ours am: af87c9c1 -s ours

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

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

Change-Id: I7d122510fe91a2327cb58594ceba91675b23c12b