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 am: 0bc002f7 am: 28d77c08

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icce9ef396cbf0885d333ef26f5e1f6f11bc42c83