Merge changes from topic "mteenabled" into main am: 7ea4c99263

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3530461

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