Merge "Affordance returns to normal size after activation" into tm-qpr-dev am:...

Merge "Affordance returns to normal size after activation" into tm-qpr-dev am: 04994ffb am: 82d8e893

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



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