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

Change-Id: I4362d0d507022439dfcb0795d43233ccefaa6da5