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

Change-Id: I30161c31529fc0c5254353f4329cbd5165fcbd82