Merge "Revert \\"Fingerprint: Add an API to support throttling.\\" am: e453c5212a am: e6328cca4f" into nyc-mr1-dev-plus-aosp