Merge "Merge "Add test for rollback of same version apk." into qt-dev am: ceba00a7" into qt-dev-plus-aosp