[automerger skipped] Merge "Fix NPE" into sc-qpr1-dev am: f8e5b63d26 am: df4fd53f37 am: 1e02fd81cf -s ours am: 795899e624 -s ours am: ea49fa9c61 -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/+/17592145
Change-Id: Id29a149ccc706523fe0fb690294a47127d3b550c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: