Merge "Remove libandroidicu dependency from FwdLockEngine" am: a6d57df8f7 am: 36e029025e am: 61cedfb27f

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

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