Merge "Add system option to disable lock profiling" into qt-dev
am: 10d9320c3a

Change-Id: I59355027ead8d03df7adc6d424c4b8e18b0ea78c