[automerger skipped] Skip ab/6749736 in stage. am: 0825ebfcca -s ours

am skip reason: Change-Id I964c2e898eacd76db377e988193849e89d1edcc4 with SHA-1 2c57993d35 is in history

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/art/+/12793671

Change-Id: I7ea223b85b098c3960ae758cab293b3eb11be498