Merge "Fix NPE" into tm-dev am: 2b38dbd4 am: 1218e5f8 am: fdefc822 am: f5989296

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



Change-Id: I02755b4c43ad229f734ae10f1c9911f6def50e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>