Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into tm-dev am: f8e813e6

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



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