Merge "Add a CTS workaround for AID_CROS_EC." into main am: ef216177f2

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

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