[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: 36c0fb7b -s ours am: 97d31d54 -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: I097134627bdd5f802c900f1c06944f4d08227d29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>