[automerger skipped] Merge "Fix the functionality of log-visibility" into...

[automerger skipped] Merge "Fix the functionality of log-visibility" into tm-dev am: 68bed01e -s ours

am skip reason: Merged-In I21fdc26ab32c65a4703ce0618281c8b775532418 with SHA-1 e0e47402 is already in history

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

Change-Id: Idc965e2939ad2ee7f8032fafdf50faf92708db0e