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
am: 77f25d74
Change-Id: I43757a2d08464565618c946d9f6b161ba457b88f