[automerger skipped] Update preferred payment related APIs am: c324308b13 am: 8adf9d8196 -s ours

am skip reason: Change-Id Ibe0c77bb25da2673cc8f46cd1e2735c0a1e30523 with SHA-1 d70879e5bb is in history

Change-Id: I957171e4559d32fb404b34284e21f3dc1271f914