[automerger skipped] Fix NPE am: a3e2e68f am: 2f86e541 -s ours am:...

[automerger skipped] Fix NPE am: a3e2e68f am: 2f86e541 -s ours am: 9b3f3125 -s ours am: 0b2b4ab5 -s ours am: 42a5e49c -s ours am: a1e17971 -s ours am: b21a30d7 -s ours

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

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



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