Merge "Add tests for configuaration changes on media carousel." into udc-dev...

Merge "Add tests for configuaration changes on media carousel." into udc-dev am: 024acf13 am: c1c366a1 am: 35204800

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



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