Merge "Fix NPE" into rvc-dev am: e26a608623 am: 37d0062f31

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

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