Merge "Fix multiple runs of bubbles persister test" into tm-qpr-dev am: e2acffb7 am: 26b25109

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



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