Merge "Merge "Framework: Remove ART tombstoned config" am: 95c5e5c1fd am: 3c942f040c" into pi-dev-plus-aosp
am: ebebf10023

Change-Id: Ifa1e9af2c64a2bd6a458879d8a76fddce389becb