Merge "Replaced ICU by <xliff> for OPP notification" into tm-dev am: 22cc8e2a am: b0a7c785

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



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