[automerger skipped] Merge "Remove blocking binder calls from system server"...

[automerger skipped] Merge "Remove blocking binder calls from system server" into rvc-dev am: 49a6387d am: 1f460345 am: bf27c3c0 am: 9029b9c0 -s ours
am skip reason: Change-Id Icbe0a019baa2054b0750686dd118ac17ab2c237f with SHA-1 ffd05c1e is in history

Change-Id: Id01006962b2e0adffc5ea0834c3d959e8ff5a95b