Merge "Use ArrayMap instead of SparseArray to manage the ProviderKey" into sc-dev am: d5ea86eaf0 am: 637bdf9b9a am: c868ea13d0 am: e6b762eb94

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15664720

Change-Id: Iaf9e862e5ab5008412cc2b673d00d59be6d45a68