[automerger skipped] Merge "Let aconfig protos be read by FlagFlipper" into...

[automerger skipped] Merge "Let aconfig protos be read by FlagFlipper" into main am: 9d9d6556 am: ee8ea97f -s ours am: 16ac65bb -s ours

am skip reason: Merged-In I689a15cc8c97a814df6f8e45bcf7f732d1693835 with SHA-1 0e0c3dec is already in history

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



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