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

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



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