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