Merge "Update the number of columns on config change in share sheet" into...

Merge "Update the number of columns on config change in share sheet" into tm-qpr-dev am: f3697ffe am: b82facd6

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



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