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: 0f739ec7

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



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