Merge "Fix typo in ProviderInfo" am: b3e210a9 am: f1e99464 am: dc1cc867...

Merge "Fix typo in ProviderInfo" am: b3e210a9 am: f1e99464 am: dc1cc867 am: a554a792 am: 24b36abb

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



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