Merge "[Fix Test] Modify test cases for InfoMediaManagerTest" into tm-dev am: b77a6de7

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



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