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

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



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