Merge changes from topic "demo-mode-flow" into tm-qpr-dev am: c65b0f05ce am: 5543e25ffc

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

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