Merge "[CDM] Update binding flag for self-managed apps" into tm-dev am: c4be963f am: f5b33da6

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



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