[automerger skipped] Merge "Remove flakyness in...

[automerger skipped] Merge "Remove flakyness in BugreportManagerServiceImplTest." into udc-qpr-dev am: 5dbdd4a2 am: b06bf4ac -s ours

am skip reason: Merged-In Ic65ad65ad595c4452bd6c063e3faa9f4ad2ecc9a with SHA-1 ff21ccf7 is already in history

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



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