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

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

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