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

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

Change-Id: I528f248ddec72384d238d5b4262e604f2f7eeeab