Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0

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

Change-Id: I24fa6527a0b5727f5c1830d528dc86e27abf3c8b