linaro_swr: Sync-up with recent db845c-userdebug fixes am: dfe152c144

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

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