[automerger skipped] Merge Android R am: dcb54d425a -s ours am: 3563b4b56b -s ours

am skip reason: Change-Id Ic43dc2b316898ebb8e5505ce0c2d2908abad5fd2 with SHA-1 f609e272ee is in history

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

Change-Id: I0819c853a45e34e1c0fdc61475c551006ee735ea