Merge "Disable short-service debug log (stopship)" into udc-dev am: c2d56904...

Merge "Disable short-service debug log (stopship)" into udc-dev am: c2d56904 am: 83c409a7 am: bf1289a5

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



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