Merge "Insulate against log spam." into main am: 58a64a4d

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3154739



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