Merge "Add system option to disable lock profiling"
am: b1ec00b5ea

Change-Id: Ic7f4b3397d497cfa7c29c9497c047e6eb3d71364