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

Change-Id: I04b0b4d9ddea904a03f66a14f0b6cdfcc4ca752b