Merge "Merge "Add flagRemoved check back in BubbleExtractor" into rvc-dev am: 8c624b80 am: 1e45159b" into rvc-d1-dev-plus-aosp