Merge "Fix NPE" into tm-dev am: 2b38dbd41b

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

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