Merge "ShutdownThread: flag off debug logging" am: 5cde57c3 am: 67606be2

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



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