Merge "[DO NOT MERGE] Clear properties after interaction is ended" into rvc-dev am: cdaa4f3cb0 am: d6744b0a9b am: c71cc8a299

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

Change-Id: If8ded5961af1a0d56217f32c8e9184ca7fded85a