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

Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into sc-dev am: 5a56907a am: bb4092a3 -s ours am: b988286b -s ours am: 3947d1cd -s ours am: d8f61530 -s ours" into udc-dev am: be7ad6dc

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



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