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

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

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