Merge "Merge "installd: Add support for migrating legacy obb data." into qt-dev am: 41ef39cec9 am: 65fbc560de" into qt-r1-dev-plus-aosp