Merge "Fix potential NPE & clean up some logic" into tm-dev am: 5126e8b1b5 am: 7d2923a911

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

Change-Id: I0b976f3549f768e56dcfda177d9da5cf337f9b37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mady Mellor
2022-05-18 22:00:04 +00:00
committed by Automerger Merge Worker

Diff Content Not Available