Merge "Ensure proguard doesn't over-optimize Flags Library." into tm-qpr-dev am: 833608c8

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



Change-Id: I2db590b060932dba49c1b89d1c3226d5a8802f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>