[automerger skipped] Merge "[DO NOT MERGE] Subcard logging - Media Card code path Test: TBA Bug: 205864845" into sc-v2-dev am: 2f448357 am: 6e5195e5 -s ours am: c78874f4 -s ours

am skip reason: subject contains skip directive

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



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