[automerger skipped] Merge "Fix NPE" into sc-qpr1-dev am: f8e5b63d am:...

[automerger skipped] Merge "Fix NPE" into sc-qpr1-dev am: f8e5b63d am: df4fd53f am: 1e02fd81 -s ours am: 795899e6 -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/+/17592145



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