Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: 67596632

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I365cb6b774ccb9a4d73654b73bfde00ef2eaf327