[automerger skipped] Merge "DO NOT MERGE: Fix span computation" into qt-car-dev am: c155dc0c72 -s ours am: 85578ce28e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Media/+/12621684

Change-Id: I92aea903710b0220c610a0360f3b43eee9e54108
tree: b36cfb6e8a24a722c7fd0c6ad00383e2d2bfdea8
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS