Merge "Add ro.treble.enabled" into oc-dev am: 84cbb4e903
am: d1dd861eda

Change-Id: If6b656dd1a5a761eb36b43b1062c0db874ba25e1