Merge "Fix NullPointer when factory debug flag enabled" into tm-d1-dev am:...

Merge "Fix NullPointer when factory debug flag enabled" into tm-d1-dev am: fa448092 am: ef119ae2 am: 26d2fa0e

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



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