[automerger skipped] Merge "Add null checks" am: 2e77ad99 am: 6eda1f24 am:...

[automerger skipped] Merge "Add null checks" am: 2e77ad99 am: 6eda1f24 am: 691e8c1e am: 3272f72e am: 483efe1e -s ours

am skip reason: Merged-In Ie6eaf061d74bd773742aa47f731e95e4b137f438 with SHA-1 a4664b66 is already in history

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



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