[DO NOT MERGE] Clear properties after interaction is ended am: 1145db5d8e am: 63a3ab4e33

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

Change-Id: Ie7526e85dcf04104d5748e4b7bcb9c714cbab03d