Merge changes from topic "shapes" into udc-qpr-dev

* changes:
  Add shapes to PIN bouncer
  Tweak AVDs to make them work with the compose androidx.compose.animation:animation-graphics library.
  Reformat AVDs to allow better understanding of the changes in the follow-up CL