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 am: 575e0cfc

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



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