Merge "[Chooser/ResolverActivity] Fix flakiness in work profile tests" into tm-qpr-dev am: da209b100a am: 341a6e0ee9

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

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