[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: 8b4140d2 am: 4a4aca69 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3a10c3c23dfd4e8647f07405b5dcfdfce553ce11