[automerger skipped] Merge "Set up platform flags to use for enabling proto...

[automerger skipped] Merge "Set up platform flags to use for enabling proto tombstone" into main am: a779b380 am: b07dd5f8 -s ours

am skip reason: Merged-In I76bd6ca0fd7d97e848784a640d359d3fd009621b with SHA-1 a3e9e1c7 is already in history

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



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