Merge "Merge "Merge "Due to dependcy to reSizableActivity this test need to be restricted to sdk version 23" into nougat-cts-dev am: 4e6cde750e" into nougat-mr1-cts-dev am: 8d0b645a47"
am: 796512817c

Change-Id: Ie90530e03a7d51a14d37b6cb976e022da1a0e737