[automerger skipped] Skip ab/6749736 in stage. am: 24b41ebf97 -s ours am: 8d0d531848 -s ours

am skip reason: Change-Id Ie14a260ac787a60c723fe247769d3788a6b1848a with SHA-1 212de64ef9 is in history

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

Change-Id: I426fa0bea30302ee58973ef22ef120f78deb3ae3