[automerger skipped] Fix NPE am: e58049a3 -s ours am: 651840fc -s ours am:...

[automerger skipped] Fix NPE am: e58049a3 -s ours am: 651840fc -s ours am: 9a793e0b -s ours am: 249799a0 -s ours am: ec0c0577 -s ours am: 02b3257c -s ours am: 4e94fadb -s ours

am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 a3e2e68f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591190



Change-Id: I84c9b6ac8359e9646f72392788e24b84e36d7e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>