Merge "Fix NPE" into rvc-qpr-dev am: 9fa47ab99b am: 9cb37b0f37 am: b4261e651c am: 982d229ba7 am: 8b69c12b8d am: 3906f49bea am: 954ef3824c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886857 Change-Id: I4b8288ede90e9f7ded99735e5db39c3cbd43b0e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: