[automerger skipped] Make FeatureFlagManager Dumpable am: 4d9465b028 am: 89e49eea8b -s ours

am skip reason: Merged-In I6a42a697120179048e848f7f432fd753db514b9c with SHA-1 2cce8c440c is already in history

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

Change-Id: If585ff3687be1385d0dc78d4d599b2d3eec9bb95