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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8033d0e1c60c957aa149c052dd1ba653f5449d5d