Merge "Change userdebug/eng check with debuggable device." into udc-dev am:...

Merge "Change userdebug/eng check with debuggable device." into udc-dev am: 3b2fc2f3 am: 8664d2d6

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



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