Merge changes from topic "cdm_overlay-pi-dev" into pi-dev am: 99e5a28c am:...

Merge changes from topic "cdm_overlay-pi-dev" into pi-dev am: 99e5a28c am: 260d69a4 am: 82b0600b am: 519201b8 am: faea606f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I123bd3191e6e33d1eeecd0ba0ec4c663522c6e60