Merge "Merge "Store work lock type even it uses unified lock" into nyc-dev am: 610fb8a3f2 am: 56181175a7" into nyc-mr1-dev-plus-aosp
am: 26bbadc484
* commit '26bbadc484f094a9e89f59ad946d74d4b4f8aa82':
Change-Id: Id06de5146cc22a6ac86f00c734f4131b16d345c7
This commit is contained in: