[automerger skipped] Merge "freeze rpc binder wire protocol" am: 9843b07b...

[automerger skipped] Merge "freeze rpc binder wire protocol" am: 9843b07b am: 9b4675ec am: 8bbfcd41 -s ours am: 38ebf515 -s ours am: 3b7d8e00 -s ours

am skip reason: Merged-In Iafa1f49a9f0f536162c59ff44143f05b61e9c9e8 with SHA-1 42e5e142 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2534786



Change-Id: I349550e2d1b8cbdb786fc73434eb2ccdaa595cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>