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

Change-Id: Ie6acc6e38b6a959db03d8b319b2b3cc00b75030d