Merge "Add resources and notices to 30/non-updatable.jar" am: 653f250138 am: 9a2ca65738

Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1684765

Change-Id: Ia81a399f6f968973a0ec8c317de60585fea8548a