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: 0ae25c7c am: 85c4b1d7 am: c891b2bf

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



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