Merge "Disable flaky MR2ManagerTests" into main am: 6dbaa54098 am: f6c05e0ec1

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

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