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

Change-Id: Ie7a3f15d38d6168ce7935aa7ea03107484372fd2