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

Change-Id: Ifadf272d28482c3be696b72b299e837e564e6bbd