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