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

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

Change-Id: Ief600f089ab176da59746fe2f21c2d4b26f3182d