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

am skip reason: Change-Id Idb1acd71a7231a23c25dbb8831b9395f9d6ebcc6 with SHA-1 ce58ba53c1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/apf/+/12797265

Change-Id: I12d77f1db683882d8e7e96dff18fabbc14ecf147