Merge "Partially revert "Ignore incorrect NewApi Lint warning for...

Merge "Partially revert "Ignore incorrect NewApi Lint warning for ENTERPRISE_CONTENT_URI"" into udc-dev am: ec3cd0ad am: f290f1c6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22721250



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