Merge "Add direct usage of Flags in demo app" am: 7845b265db am: 6a081f3baf

Original change: https://android-review.googlesource.com/c/platform/development/+/2646203

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