Merge "Merge "Port module metadata filtering to ITestSuite" into oc-dev am: 98fcbca026 am: 4a6c3ce612" into oc-dr1-dev-plus-aosp
am: bc3c7a3413

Change-Id: Ia00e95872162848d2f52aab63efbfa2e28a98997