[automerger skipped] Merge "Fix NPE" into sc-dev am: 829b1e82 -s ours am: d2bce37d -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: I2537598840f302a5544e2b0422ffa858a39aab43 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Loading