Merge "Fix NPE" into rvc-qpr-dev am: 9fa47ab9 am: 9cb37b0f am: b4261e65 am: 982d229b am: 8b69c12b am: 3906f49b am: 954ef382 am: 4be60010 am: e6ea833f

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



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