Merge "Make sure all debug logs could be present after enabled" into tm-dev...

Merge "Make sure all debug logs could be present after enabled" into tm-dev am: 2b9326b1 am: afdd82a9

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



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