Merge "Make the binder_lock category optional" am: 61e58d5a47 am: c4a8373ccd am: f06f26bbb5
am: c821f28ff2  -s ours

Change-Id: Ib6d4562fa23099469bf963037802b225457ec954