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

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



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