Merge "Merge "Fix potential NPE in STHelper" into udc-dev am: c27813eb am:...

Merge "Merge "Fix potential NPE in STHelper" into udc-dev am: c27813eb am: 3b1b4010" into udc-d1-dev-plus-aosp am: 611e0fd7 am: ff36ef2a

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



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