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: 69d3f126

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



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