Merge "Remove blocking binder calls from system server" am: b7eb7b3579

Change-Id: I02ea1836a54fb33c42f19fde593b39378c979be5