Merge changes from topic "am-70560489aa0542c99c9043781a2333f5" into rvc-d1-dev-plus-aosp

* changes:
  Merge "[DO NOT MERGE] Clear properties after interaction is ended" into rvc-dev am: cdaa4f3cb0 am: d6744b0a9b
  [DO NOT MERGE] Clear properties after interaction is ended am: 1145db5d8e am: 63a3ab4e33