[automerger skipped] Limited use key: feature flags. am: cd6c58ac am: 56e16a02 am: 5e8ba3c7 -s ours

am skip reason: Change-Id Id9c13ee91b779164bd07ff20ae2b4c0e158fdb33 with SHA-1 e8af7795 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28e194493ca514dde72b3251892d851fdd526e2d