[automerger skipped] Merge "Don't use LOG() in code that runs post-fork." into...

[automerger skipped] Merge "Don't use LOG() in code that runs post-fork." into sc-dev am: 40214cbd am: 4d7fef69 -s ours

am skip reason: Merged-In Icf7a04c8f9d244b7bdd94b2111f41ce489d39302 with SHA-1 fd9ee2e1 is already in history

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

Change-Id: I03b89f955117640876c177911d0fab34afba673a