Merge "Merge "Stub the oemlock operations when the PersistentDataBlock is not supported" into qt-dev am: 13ee78763d am: e633afa786" into qt-r1-dev-plus-aosp
am: 0da3432fbc

Change-Id: Ied7ecaed4e9ee381cd29f15c1097f7c7834362ed