[automerger skipped] Merge "Make manual suggestions synchronous/return result" am: 08466f6151 am: 413f8199da am: c7a7943a2a -s ours

am skip reason: Change-Id I5b6b7fb5af2ffe88392b2ca8d1e8fff2a187521b with SHA-1 1fde0596bb is in history

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

Change-Id: Ifc3acc5dfc245ce58d7cb7221e6c8e22e034a241