[automerger skipped] Merge "Fix NPE" into sc-v2-dev am: f56a9bd2d0 -s ours am: 3be41a17bd -s ours am: 4ec484f8d7 -s ours am: 359a980a2f -s ours am: e2fcd8760d -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 18179a8762 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17592146
Change-Id: I3cafe5a043365e54cbe07aea857d927215143570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: