Merge "Fix failing benchmark by correcting Provider name." am: 4b99d002 am:...

Merge "Fix failing benchmark by correcting Provider name." am: 4b99d002 am: 1da4413c am: 158caa7c am: 3f9f7289 am: a20fb8e2

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



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