[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: f48545f6 -s ours am: 311f7eb4 -s ours am: 88bab44b -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: I2f9e6d8b587fb84a1ba2d70bce7eaab1a200d15e