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

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



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