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

Merge "Merge "Fix NullPointer when factory debug flag enabled" into tm-d1-dev am: fa448092 am: 0f739ec7" into tm-qpr-dev-plus-aosp am: b2c389cb

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



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