Bring AOSP and internal in sync for protos am: b96993a2f1

Original change: https://android-review.googlesource.com/c/platform/packages/modules/ConfigInfrastructure/+/3449810

Change-Id: Ifb4ee05ae1dca2194e753bc2383eaf09462ea3f4
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: 1b41c4b8337415680cbb2e9376dc1297bbc2ea8e
  1. aconfigd/
  2. aflags/
  3. apex/
  4. framework/
  5. service/
  6. OWNERS
  7. TEST_MAPPING