Merge "Change userdebug or eng condition check with debuggable" into udc-dev...

Merge "Change userdebug or eng condition check with debuggable" into udc-dev am: f64fa079 am: 42d03bbe

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



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