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

Merge "Do not keep runtime invisible annotations in proguard.proguard" into main am: 69c28d69 am: be3384b4

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



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