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

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

Change-Id: Id1041eb68e5ec98b77b560164136cbde52004d53