Merge "Fix NPE" into rvc-qpr-dev am: 9fa47ab9 am: 9cb37b0f am: eff219ab...

Merge "Fix NPE" into rvc-qpr-dev am: 9fa47ab9 am: 9cb37b0f am: eff219ab am: 882e5d7f am: fd86694c am: 1f81f77c

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



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