Merge "Avoid exporting libandroidicu headers from libmedia" am: 6d437e093a am: b6530c499a am: 2ac32ce61b

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2382649

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