Merge "Resolve ro.debuggable at build time" am: 68e3a6f9 am: b3d6c246 am:...

Merge "Resolve ro.debuggable at build time" am: 68e3a6f9 am: b3d6c246 am: 8e096b55 am: c991a776 am: f7f0964c

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2202438



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