Merge "Enable testOnSmartspaceMediaDataLoaded" into tm-qpr-dev am: 5d2b14cf8d am: 3cc90808c5

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

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