Merge "Switch to doReturn notation for spy method mocking" into udc-qpr-dev am: 532bca37b4 am: 9a56cc24f6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/24023483

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