[automerger skipped] Merge "Clean up proguard.flags." into udc-dev am:...

[automerger skipped] Merge "Clean up proguard.flags." into udc-dev am: 01b56bb0 am: 3b4f7b66 -s ours

am skip reason: Merged-In I014039a8187057bb85b526d3cdfb5ea1324a916b with SHA-1 3b2b0e7f is already in history

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



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