Merge "Use minimumInteractiveComponentSize() instead of custom modifier" into tm-qpr-dev-plus-aosp am: e240d8a8e8

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

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