Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 53825749 am: 08476180

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1166627468f5d11aef69301318658eb7f4aae84