Merge "Merge "Remove apk test until I figure out why it is failing" into nougat-cts-dev am: e1abc7e766 am: 3df503c11b am: 562fe3c64b am: e176fce5f9 am: 1d49602ab5 am: 6113ae9427" into nyc-mr2-dev-plus-aosp
am: f63cb03ebe

Change-Id: Ie6ff593df15abafe0e31d7ff09c44391f3387faa