Merge "Fix MediaCarouselController Tests" into tm-qpr-dev am: 76a33028c6 am: 9d19dfc6f5

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

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