Merge "Move tests added in n-mr2 into new aosp location." am: 5511f7cfc2 am: ac6e0cc770
am: b1d4313777

Change-Id: I62688cacb486f55bb48ea55b14e4e3416493ea30