Merge "Pre-work to decouple ChooserGridAdapter" into tm-qpr-dev am: bdef319472

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

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