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: 5e7447a0 am: c22a4318

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



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