Merge "Do not keep runtime invisible annotations in proguard.flags" into main am: ac931e8ac3

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/3452836

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