Merge "Add API flag for AFL API" into main am: 69ee324abf am: f8a1708bdc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3294172

Change-Id: I3e44dc0b5f9a7c8d48f51ae12800f62cda72c06c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>