Merge "Remove proguard.flags from shared/" into tm-qpr-dev am: 180e21a9 am: 03736d2d

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



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