[automerger skipped] Merge "Remove hidden api dependency of FeatureFlagUtils"...
[automerger skipped] Merge "Remove hidden api dependency of FeatureFlagUtils" am: c964871b am: 7da82547 -s ours
am skip reason: Change-Id I2077554cfc6d66e0a2d7682aee11dc9f4364b7d0 with SHA-1 18123544 is in history
Change-Id: I13c38f4e1a0a501feae4a53393a5f51cce1f2067