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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64ece3292d6cd088455547b0365ea4ffc8e6378c