Merge "Do not keep runtime invisible annotations in proguard.proguard" into...

Merge "Do not keep runtime invisible annotations in proguard.proguard" into main am: 05527743 am: d49aaae1

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



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