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

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



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