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

Change-Id: I6f9d043a8a2ac1a3a1d6a1e135fb061b94edccba