Merge "Load aconfig demo flags in system partition" into main am: 2bdc6406

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



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