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

[automerger skipped] Fix NPE am: a3e2e68f am: 2f86e541 am: 72a161f3 -s ours am: a639d4c3 -s ours am: 01ff3502 -s ours am: 11b381ba -s ours

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

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



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