[automerger skipped] Merge Android R am: dcb54d425a -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: I91d5bded87a7674ce5949a226d158d1923d6acfe