Merge "Merge "Merge "Merge "DO NOT MERGE: Add CTS test for bug 65483665" into lollipop-mr1-cts-dev am: 5a5e5e642c  -s ours" into marshmallow-cts-dev am: 73a8be40e7  -s ours" into nougat-cts-dev am: df74d2b3a8  -s ours" into nougat-mr1-cts-dev
am: 61ca6b326f  -s ours

Change-Id: I2b88b02e4b38d9af6159a7b0f121e7cdaf8e44df