Merge "Merge "Enable upgrading persistent APKs on boot." into qt-dev am: f400227e7e" into qt-dev-plus-aosp