[automerger skipped] Fix NPE am: e58049a3ea -s ours am: 651840fc64 -s ours am: 9a793e0b65 -s ours am: 249799a0a7 -s ours am: ec0c0577c9 -s ours am: 02b3257cd2 -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 a3e2e68fd0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591190
Change-Id: I7c63ded44563a5a5a5a614ec99901f6c479b7b43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: