Merge "Make Chooser 4-column on tablets" into tm-qpr-dev am: 4cb516d8

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



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