Merge "Respects device policy to disble quick affordances" into tm-qpr-dev am:...

Merge "Respects device policy to disble quick affordances" into tm-qpr-dev am: 06acd509 am: fac8e2cf

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



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