Merge "Stub the oemlock operations when the PersistentDataBlock is not supported" into qt-dev
am: 13ee78763d

Change-Id: I292952a30e404b10b698fb46e873f35f19722944