[automerger skipped] Merge "Make createBond(int) a system API" am: 818797fc...

[automerger skipped] Merge "Make createBond(int) a system API" am: 818797fc -s ours am: 500feca6 -s ours

am skip reason: Merged-In I10d9ac305cbc1bb28c8150e1b167a0e61ad3f04e with SHA-1 dc0e2a44 is already in history

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

Change-Id: I5a917832f1f8ae48a2c93ab70d63db326f90c644