[automerger skipped] Merge Android R am: 07b389867f -s ours am: 92dbce6926 -s ours am: 5373f4098a -s ours am: aca33b5a79 -s ours

am skip reason: Change-Id Ieb0746ea38172666412d8de3fd08ab89c3590d0c with SHA-1 527d66b869 is in history

Original change: https://android-review.googlesource.com/c/platform/compatibility/cdd/+/1421706

Change-Id: Ia24e29da9ad5591221d7e281204d83794c5a5331