Limited use key: feature flags. am: cd6c58acd8 am: 56e16a0208

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41b4c5a3272925b4bb71fbb1d57992793d1602c7