Merge "Fix Dialog default callback registering at the wrong priority." into tm-qpr-dev am: 0143f62f7a am: 0ef5d9b152

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

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