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]>