Merge changes from topic "demo-mode-flow" into tm-qpr-dev am: c65b0f05

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



Change-Id: I9836bddd5a22fa165084f28f477ec1e61417d447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>