Merge "add more variantions for flag on/off filtering demo" am: d811c8842b

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

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