Merge 10952656 am: e5548d9965 am: b941499f09

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/25090926

Change-Id: Ia5bdeb98f80ffaa0f77da37f9428574d55dc6581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: b7ef6ec05340c4368cc8663cfe706f8dee03d057
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS