Merge "Don't fork USAPs with open argument buffer" am: 6c61c65f19 am: 7644e0c5b7

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

Change-Id: I3d26e93f5a85943f6d3cf2371d1079213c36089d