Merge "Add a build-time flag for AVF permission change" into main am:...

Merge "Add a build-time flag for AVF permission change" into main am: c774b33c am: 81b0c646 am: 86333ce6

Original change: https://android-review.googlesource.com/c/platform/build/+/2757405



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