[automerger skipped] Merge "Add a separate flag in the installer for keeping...
[automerger skipped] Merge "Add a separate flag in the installer for keeping ART profiles" am: 1cde0795 am: 3b90f88c am: 04e1a054 -s ours
am skip reason: Change-Id I3bafdef769d7838d8048b7df4d7a779464104641 with SHA-1 e8ef7b0b is in history
Change-Id: I7c000b76865c2f730dec88e1ab805a7c11b8548f