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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib612a893e68e50d1abdfd5c788fb46459e329c2d