Merge "Revert to enabling the register/unregister APIs based on the feature...

Merge "Revert to enabling the register/unregister APIs based on the feature flag, as opposed to always enabling them." into udc-qpr-dev am: de076d0d am: 1c3adbb4

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



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