[automerger skipped] Merge "Remove FeatureFlagReader. Allow resource...

[automerger skipped] Merge "Remove FeatureFlagReader. Allow resource overlays." into sc-v2-dev am: f3e12619 am: 6ac67b5f -s ours

am skip reason: Merged-In Ifb895fd6c5b40d4adfe2997f4ce1f4d7d2145183 with SHA-1 7bc36943 is already in history

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

Change-Id: I2464b5bc28b8f14196f1edc8ead107ed194bd93e