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