[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: f5b33da6 am: 60d6a31d am: b43ee9bf -s ours

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

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



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