[automerger skipped] Fix NPE am: e58049a3 -s ours am: 651840fc -s ours am:...

[automerger skipped] Fix NPE am: e58049a3 -s ours am: 651840fc -s ours am: 9a793e0b -s ours am: 570bf6b1 -s ours am: e1d0d475 -s ours am: 3ec8a826 -s ours am: 3f8cf149 -s ours

am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 a3e2e68f is already in history

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



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