Merge "Replace libavservices_minijail_vendor with libavservices_minijail" am: 953b19dff7 am: d937c0e718

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1787467

Change-Id: Ibf85751b2de07b241ce67260db8ecca5118f551c