Merge "Merge "Stub the oemlock operations when the PersistentDataBlock is not supported" into qt-dev am: 13ee7876 am: e633afa7" into qt-r1-dev-plus-aosp