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

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

Change-Id: I7c9f2568a59670fb6f067b322b6fdd2d9fa34167