Merge "Include Treble metadata on Treble enabled devices" into oc-dev