Merge "Merge "Only play up effect if its been over 100 ms" into oc-dr1-dev am:...
Merge "Merge "Only play up effect if its been over 100 ms" into oc-dr1-dev am: 457c58f9" into oc-dr1-dev-plus-aosp
am: 0a97a0e7
Change-Id: I34661d918ac9342353e5f0bebb1c87e8561d70ae