Merge "Do not clean up ART profiles during OTAs" am: 2d9c3071d9
am: df60db0de6

Change-Id: Ib2546c84ec6327c1e30610193757847ede5fae40