Merge "Avoid exporting libandroidicu headers from libmedia" am: 6d437e09 am: b6530c49

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



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