Merge "Use minimumInteractiveComponentSize() instead of custom modifier" into tm-qpr-dev am: 5380e1de75 am: cb29b6d2a3

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

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