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: ba216d74 am: 6705a785

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



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