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

[automerger skipped] Merge "Fix NPE" into sc-v2-dev am: f56a9bd2 -s ours am: 3be41a17 -s ours am: 4ec484f8 -s ours

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

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



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