[automerger skipped] Merge "[DO NOT MERGE] Clear properties after interaction...

[automerger skipped] Merge "[DO NOT MERGE] Clear properties after interaction is ended" into rvc-dev am: cdaa4f3c am: 58094f56 am: 2a0c90de am: 9b787b85 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I81685615ea54e6e851bae7d6efa3d5e7dc4edc65