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

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



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