tree fe5d18f55f4071c9ed02054049ee5cee239fae95
parent bc8811929a00f8925e8ca95647a4ce0692835e54
parent 812f10cff12103f543a4e2e574e5c92a6dbed70b
author Julia Reynolds <juliacr@google.com> 1663868149 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1663868149 +0000

Merge "Fix NPE" into sc-v2-dev am: 70cc3c99d3 am: 1cdad7c9ae am: 812f10cff1

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

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