Merge "Support dynamic feature flag config" am: 201737c781 am: b9f0ad138b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I183892c7df058dc6f73c08afda263a0a840293bb