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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22ef7c07d5e7a7284810aff3f5308fcacb1f6b2c