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

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

Change-Id: Ic5fd1b95e07a77af0e1cb524101158c69948ca68