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

Change-Id: I3c65f1138eeee63623661284f7cfd3e6f9649d6c