[automerger skipped] Merge "Move FeatureFlags to flags package." into...

[automerger skipped] Merge "Move FeatureFlags to flags package." into sc-v2-dev am: 201031b0 am: 1d4086d5 -s ours

am skip reason: Merged-In I851f941487985ddf5aebd0be39e9f8387e50933f with SHA-1 cfac4b65 is already in history

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

Change-Id: I9a036074dcdcc06dd65fe8e2a75fabad8a8837f1