[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: d6744b0a am: c71cc8a2 am: f8aea0dd -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia03c64ecb120a936011188886f9fd15c2a3e131e