[automerger skipped] Merge "[CDM] Update binding flag for self-managed apps"...

[automerger skipped] Merge "[CDM] Update binding flag for self-managed apps" into tm-dev am: c4be963f am: b7b6f4db am: 7876d731 -s ours am: 03879ac3 -s ours

am skip reason: Merged-In Ic25f5a438d6679ab08f725832cee3cce74ac611c with SHA-1 a833f61f is already in history

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



Change-Id: I4e029ff6346536c7168ca08ac053d42de2a4ad41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>