[automerger skipped] Merge "Fix NPE" into sc-dev am: 829b1e826e -s ours am: 205b20b9d2 -s ours am: ced5f2c09a -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 73d533592a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17592027
Change-Id: I5166d4917af13f4b7013b3c75c8cb823c286cd51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: