[automerged blank] Fix NPE 2p: 73d533592a 2p: da1b2722e0
Blank merge reason: Change-Id Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 07e31dfb1e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17592027
Bug: 227342978
Change-Id: I3f63f915b12251f154ace404095de27340b4195b
Merged-In: Ia21323926bd9db1a6f05461904deb45b4c3dd0bc
This commit is contained in: