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

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

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