Merge "More actionable reenablement dialogs for quick affordances." into udc-dev am: 00ce757dbf am: 48c068b41e

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

Change-Id: I85b8c1e94d6270006cce866e13a1879f55161cd1
Signed-off-by: Automerger Merge Worker <[email protected]>