[automerger skipped] [DO NOT MERGE] Clear properties after interaction is ended am: 1145db5d8e am: 7d4d9ab906 am: ce25992437 am: 039db08304 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I957b54bdbd3d4eb4534d1d0daf5f8b5cad3c6966