Merge "Fixes quick affordance visibility bug." into tm-qpr-dev am: 7e098699 am: 1846a65a

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



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