[automerger skipped] Construct sdk-annotations.zip programmatically am:...

[automerger skipped] Construct sdk-annotations.zip programmatically am: cc18e03e am: 5a424a80 am: 4e08748d am: d9d7a39d -s ours

am skip reason: Merged-In Id3983bf5f4b96b23b1da09fd3617870ac3926ea1 with SHA-1 7a173a62 is already in history

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

Change-Id: Iaa80f0d8973e29b2c01e2bcedb3540ea957f0261