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

Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 53825749 am: 08476180 am: 77d6da84 am: 88ad6db9 am: 3516e98d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9fc3424fffffc3751faf53f8ca87d2c94864ce23