[automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 am: 25d1e643ec -s ours am: f289bf2d8b -s ours am: 620ec21de0 -s ours am: 7a215dcffa -s ours am: e19ce0039d -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: I85930acfdae6698d87a98de189dcaae9bd672753
This commit is contained in: