Merge changes from topic "dialog-refactor" into sc-v2-dev am: 9f02d2fd am: 2c3c9898

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

Change-Id: If62ebc2f576739d97ab94e73b5ef25055c42ee55