Merge "Revert "Check ro.treble.enabled for legacy devices""
am: a9dc08c8cd

Change-Id: I7812fde519f6da46699a966d0b1e0f0c418956f4