[automerger skipped] Merge "Introduce uses-native-library tag" am: e6c21e2e...

[automerger skipped] Merge "Introduce uses-native-library tag" am: e6c21e2e am: 64f6fa6f am: 41521641 am: 590462e1 am: 40a0100d -s ours

am skip reason: Change-Id Iceb038aa86872d23e9faf582ae91b1fdcaf5c64c with SHA-1 6a5b8b1f is in history

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

Change-Id: I8ab62b386b8ab1108acc4ec0ddc223fa199c4f0d