Merge "Fix typo in ProviderInfo" am: b3e210a9c2 am: f1e99464ce am: dc1cc867a4

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

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