Merge "ShutdownThread: flag off debug logging" am: 5cde57c340 am: 67606be29f am: d7db3977ac

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

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