Merge "Merge "Fix NPE" into tm-dev am: 2b38dbd4 am: 22d21f29" into...

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

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



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