Merge "Merge "Fix tests - needed a reasonable max set in bubble positioner"...

Merge "Merge "Fix tests - needed a reasonable max set in bubble positioner" into sc-dev am: 4de2f908" into sc-dev-plus-aosp am: f03017c7 am: 5803ff64

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

Change-Id: Iced2ac7a62493c859660bd75ac19183c09561ee2