H: fix tap to pay

Change-Id: I752fbf46f7e5371973115e2f95ce3a00eaef3588
Merge "H: fix tap to pay" into cm-11.0