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

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

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