[automerger skipped] Fix NPE am: a3e2e68fd0 am: 2f86e541d9 am: 72a161f31e -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 07e31dfb1e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591433
Change-Id: I1211bddc108439dd1c02fc22e0238fb1540cb34f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: