tree ac898e40d6b9fe8b20f76c529488058f3334f1f9
parent 016a81cae4b095d949515d864fc0478d51bc451c
parent 4ac3af1243382b14dc6d64b62950c97001a711c5
author Jon Miranda <jonmiranda@google.com> 1559082223 -0700
committer android-build-merger <android-build-merger@google.com> 1559082223 -0700

Fix bug where DiscoveryBounce is not cancelled after state change. am: ed7d714805
am: 4ac3af1243

Change-Id: I91a12e2caf168ae669fc7bc18ab728002a9c4ca3