[automerger skipped] Merge "Enable annotations for framework stubs" am:...

[automerger skipped] Merge "Enable annotations for framework stubs" am: 680906b2 -s ours am: 4a1dceff -s ours am: 54a9b572 -s ours am: ace83ac2 -s ours

am skip reason: Change-Id I4fc66d607276ff885947489afd63e1370ec85939 with SHA-1 01ff6b24 is in history

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

Change-Id: I36337a8b76a14628c7babdf869ecf0140c3d30e3