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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0deef54df08b068a7cce08931111bf7a3521561f