Merge "[DO NOT MERGE] Subcard logging - Media Card code path Test: TBA Bug: 205864845" into sc-v2-dev am: 2f448357

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17304709



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