Merge changes from topic "libbinder-am-split" am: 485c83178d

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

Change-Id: I4bf1437698d48e7b876c62cfd1b4ab06782250dd