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

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

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