Merge "[DO NOT MERGE] Clear properties after interaction is ended" into rvc-dev am: cdaa4f3cb0 am: 58094f5687 am: 2a0c90de7e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12085174

Change-Id: Ia7383dfd46ae0c39f905fcbeafdb78b9e8d0adfc