Merge changes from topic "am-4dc5aff1bd8e4f008380867b43b40ead" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Add listener once for volume row animation" into udc-dev am: 4481f2ee -s ours am: fafc8167 -s ours
  [automerger skipped] Add listener once for volume row animation am: ddab6137 -s ours am: 6d1c11e2 -s ours