Move tests added in n-mr2 into new aosp location. am: e446acf954
am: 88f3295464

Change-Id: Iaf574661aa658df1285f69bfad62285bd531206a