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

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



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