Merge "Remove libandroidicu dependency from FwdLockEngine" am: a6d57df8f7

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

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