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

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



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