[automerger skipped] Merge Android U (ab/10368041) am: 8b7ed0b517 -s ours am: cad662d435 -s ours am: e7de378006 -s ours am: eba691a0b9 -s ours

am skip reason: Merged-In Ia9a37bb64ca08ec17861e63018146a5923ebc55b with SHA-1 8aacf60a2c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/armv7-a-neon/+/24181720

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