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

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

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