Merge changes from topic "predback-qs-dialog" into tm-qpr-dev am: 1b5fb5d8 am: 862919f8

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



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