[automerger skipped] Merge Android R am: 785c2bcbe6 -s ours am: eb3ab2267e -s ours am: f31d1ca5a0 -s ours am: b0c77871b0 -s ours

am skip reason: Change-Id Ia8ae3d390e8ce65cc391f18eb2faba68701d32d4 with SHA-1 a7aaaa718a is in history

Original change: https://android-review.googlesource.com/c/device/generic/uml/+/1422308

Change-Id: Ia8b2b0b1374a5bbaa8585f6d85e1e2351c40d5d7