Merge "Update Jetifier build rule" am: a1950b6d0c am: 307c228446 am: b3e2d6f000 am: 2b6344a04e

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

Change-Id: I2e5f18733d479e4b25a67c40b38f26c1ef6c9c62