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 am: b54f50de

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



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