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

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



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