Merge "Merge "ManifestConfigSource: disable debug mode" am: f4df7dd3 am:...

Merge "Merge "ManifestConfigSource: disable debug mode" am: f4df7dd3 am: 53fb1fb3 am: 517eea25" into udc-dev am: 0ff2dfe8

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



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