Merge "Add a separate flag in the installer for keeping ART profiles" am: 1cde07957a
am: 3b90f88cae

Change-Id: Ic717fa14db8a24c698d59401301c707ad11b4848