Merge "Update list of mainline-involved files" am: e9cad549ba am: 98cea4c844 am: 4838bb5054 am: 8ae98f4c18 am: a1dfd79c8b

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2222299

Change-Id: I16e1bda4be04cda07dc00a1d0dec10a7469d712c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>