[automerger skipped] Merge "Content provider for quick affordances." into tm-qpr-dev am: 99be1de599 am: 6ce13c65d1 -s ours
am skip reason: Merged-In Ia47a8ee322028042bb3e118ddb82a92a27eae191 with SHA-1 c6c5ae9594 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20446910
Change-Id: I809107404c378b996fd59f71d555c9a7373e69aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: