Merge "Merge "Add keep rules for SysUI plugin annotations" am: 1df98add am:...

Merge "Merge "Add keep rules for SysUI plugin annotations" am: 1df98add am: 3e9f1e8d am: a6998ac7" into udc-dev-plus-aosp am: 31e60774 am: 0743bf53

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



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