Merge "Make the binder_lock category optional"
am: 61e58d5a47

Change-Id: I6fec33b45edd7665d26f4c5ad5e9c7f4f7ce7d21