[automerger skipped] Merge "Merge "Include bubble changes in ranking & move flagging to BubbleExtractor" into rvc-dev am: 583092c9 am: c525fcfb" into rvc-d1-dev-plus-aosp am: 8cf48265 -s ours

am skip reason: Change-Id Ib5b62923c123187ae5f7073ec7ca50d7e20c04b1 with SHA-1 56515c43 is in history

Change-Id: I1394c0f20762de48164b483a38ea15c87991080f