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

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



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