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

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



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