Merge "AmbientContextManager API changes to support quick-tap detection" into tm-qpr-dev