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

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

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