Merge "Merge \\"Add another purchase button that uses a key which isn\\'t...
Merge "Merge \\"Add another purchase button that uses a key which isn\\'t invalidated even if a new fingerprint is enrolled.\\" into nyc-dev am: 18bd61c8 am: 3514e733" into nyc-mr1-dev-plus-aosp