Merge changes from topic "dialog-aod" into sc-v2-dev am: 94204aa474

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

Change-Id: Iede8cb03c41e91a773c7722b7646abc8ecbfc0e5