Merge "Merge "Fix NPE" into tm-dev am: 2b38dbd4 am: 22d21f29" into tm-d1-dev-plus-aosp am: 979cdb81

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



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