Merge "Check ro.treble.enabled for legacy devices"
am: 990dfcffdc

Change-Id: Ib76cac35c2f438f5a30d31f18e3c1aa4a094b326