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

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



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