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

Change-Id: I581e57ea4a3fa123ddf4984777d0523f21f4e3ae