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

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

Change-Id: Ib0101a0a326b2191fb623d1c086a6d66a812a92d