[automerger skipped] Merge "Added a debug and release version of flag reader"...

[automerger skipped] Merge "Added a debug and release version of flag reader" into sc-v2-dev am: 653657d9 am: 7078ff44 -s ours

am skip reason: Merged-In Ie01af22ef51504db5aadc0da1d367961b6aa42d4 with SHA-1 97d4fc7d is already in history

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

Change-Id: I100592b509f4a8af1db8c9fbb417e2865010fb9b