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