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

Change-Id: I7dd3b7bf4ae98876d165b849c91b5d1b289f2463