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

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

Change-Id: I35ddf8d53ab187e6b62633646cef4956266a9695