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

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

Change-Id: I7ced9a87bbb39fd772560a20ea99f148a5fd25b4