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

Change-Id: I1c8565bbc58b42522a12a2b43004fc765e20f605