[automerger skipped] Merge Android R am: d1b1144541 -s ours

am skip reason: Change-Id I2cdcc262de85c00bf4c8f014dfde4c73e3e8d72a with SHA-1 0b69784061 is in history

Original change: https://android-review.googlesource.com/c/device/ti/beagle-x15/+/1422303

Change-Id: Ibb28039c4f88173a6b843a0e265f88c405ac966a