Merge changes from topic "caitlinshk-media-ttt-displayview" into tm-qpr-dev...

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

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



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