Merge changes from topic "caitlinshk-media-ttt-displayview" into tm-qpr-dev am: dd38a02c

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



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