Merge "Update variable naming for updated API" into tm-qpr-dev am: bff86f9daa

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

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