[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: c75a2f1432 -s ours am: f84992687a -s ours

am skip reason: Merged-In Iadda123f01cd79663ae08c43e9d784a1a5e6c406 with SHA-1 6f15c9ce31 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/linaro/dragonboard/+/19094250

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