Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: 6759663285 am: a964117367 am: 8eef0f9d26 am: 0bc002f78c am: 28d77c0876

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icce9ef396cbf0885d333ef26f5e1f6f11bc42c83