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

Change-Id: Ie58b3570f0f0a12795ba5e5b8a567ac47e1acfc3