[automerger skipped] Merge "[DO NOT MERGE] T Subcard logging - Media Card code path" into tm-dev am: c6caf1cf am: 264e9594 am: 200b75df am: 9ecb1e43 -s ours

am skip reason: subject contains skip directive

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



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