tree 1fda5a80891e1e020fc47f2bedc9735adea416f6
parent 1633fc66ab8a4131d1fd685103a94643ebb75b15
parent fd86694c4d800ad2367f402be579ef48a5030540
author Julia Reynolds <juliacr@google.com> 1663877623 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1663877623 +0000

Merge "Fix NPE" into rvc-qpr-dev am: 9fa47ab99b am: 9cb37b0f37 am: eff219ab6e am: 882e5d7f74 am: fd86694c4d

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

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