Merge "Trusty doesn't need libbase logging anymore" into main am: b7dc8e61 am: ae37b166

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



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