Merge "Revert "Revert "Check ro.treble.enabled for legacy devices""" am: 8aa4ecefb5
am: c19de79551

Change-Id: Ifa645ca5bda0e78f77088da634ec5084468d557b