Import updates from Accompanist

Bug: 235727273
Test: Manually with Gallery
Change-Id: I60630f1dbf275bf414baaeb0d8bfc6496ec11886
4 files changed