Merge "Add CTS tests for Bug - 23034759 and Bug - 21132860" into nougat-cts-dev
am: e4e8edc0b1

Change-Id: Icfdbd7aee31803a947426471b0197b1391ad21e1