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: I6a85b39f1db99d0a362db1508e15ff0fa3eb8400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>