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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4dc66b1d02903fbf4bdbd6053787168281bedcd6