Merge "Include Treble metadata on Treble enabled devices" into oc-dev am: 7858d310ce
am: 4db7b3ef88

Change-Id: I30d3600cd2e4093de7fb3b8b7598baa77d0c864d