Merge "Fix NPE" into rvc-dev am: e26a608623 am: 37d0062f31 am: d39103545d am: f0e5a2896b am: b17a96d0e7 am: 9fe674cccb am: 453f94525a am: c5f78698e7 am: d1b137a8dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886858 Change-Id: I07df7a19b5909fd7265c8d3642ed0871c75bb761 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: