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

Change-Id: I545bd49fe09764c946f1f8f45520c39bc20cce9b