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 am: 40d39c5a am: 1cb483e7

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



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