[automerger skipped] Merge "[DO NOT MERGE] T Subcard logging - Media Card code...

[automerger skipped] Merge "[DO NOT MERGE] T Subcard logging - Media Card code path" into tm-dev am: c6caf1cf am: 96940014 -s ours

am skip reason: subject contains skip directive

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



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