Merge "[automerger skipped] Merge "Add system option to disable lock...
Merge "[automerger skipped] Merge "Add system option to disable lock profiling" into qt-dev am: 10d9320c am: 883b12f4 -s ours am skip reason: change_id Ida5f83e626c82266de69b13dc2def0477cc87b0f with SHA1 0d1014c9 is in history" into qt-r1-dev-plus-aosp