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: 68feffb9 am: 3d6c04b1 am: fcc5aa50

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1dc94c2535d10d57ba07655405c908339c91c95