[automerger skipped] Skip ab/6749736 in stage. am: 87386ad9d2 -s ours am: b583051311 -s ours

am skip reason: Change-Id I951c44e437484ca42eed49fd0f389026b302d176 with SHA-1 9f18237bee is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/adhd/+/12797127

Change-Id: I9281df86ee043c83b106704b8b1b43e97a2dc775