Merge "Respect the enforce flag for callback registration." into tm-qpr-dev...

Merge "Respect the enforce flag for callback registration." into tm-qpr-dev am: a2c8daf7 am: fa21ec75

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



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