Merge changes I20cd89df,I887b1044,I761e256f into main am: 0dde24bf56 am: 1bd0921558

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

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