[automerger skipped] Merge "DO NOT MERGE Address API review feedback for...

[automerger skipped] Merge "DO NOT MERGE Address API review feedback for WalletCard. Bug: b/266675271 Test: atest CtsQuickAccessWalletTestCases" into tm-qpr-dev am: 9af01525 am: 7735be81 -s ours

am skip reason: subject contains skip directive

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



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