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