Merge "update sc-mainline-prod -> tm_mainline_prod" am: 3fa17b83 am: 2eeb82c4

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



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