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

Change-Id: I9f6c96c47ae63e4f812427317592e9994b1d72fd