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

Change-Id: I99dbe36c20f5a33f1607cd2f9c0a66ae3eee1331