[automerger skipped] [automerge] Fix NPE 2p: 73d533592a am: 7d7e98d2e9 -s ours

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

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

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