[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into tm-dev am: f8e813e6 am: 75e518aa -s ours am: f796bc1c -s ours

am skip reason: Merged-In I40e1aa6377b8a60d91cb2f4189df1e9a4a4578a2 with SHA-1 af8e64db is already in history

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



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