Merge "Merge "Add CTS tests for Bug - 23034759 and Bug - 21132860" into nougat-cts-dev am: e4e8edc0b1" into nougat-mr1-cts-dev am: be41044f17  -s ours am: 6c1ccf0fbf
am: b9ff53a4d7

Change-Id: Idbd6c9f0f668340810ed812dc85661710de41705