[automerger skipped] Merge "Fix NPE" into sc-dev am: 829b1e82 -s ours am:...

[automerger skipped] Merge "Fix NPE" into sc-dev am: 829b1e82 -s ours am: 205b20b9 -s ours am: ced5f2c0 -s ours am: 4c6a2d9b -s ours

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

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



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