Merge "Merge "Merge "Revert "Due to dependcy to reSizableActivity this test need to be restricted to sdk version 23"" into nougat-cts-dev am: 1fbc366280" into nougat-mr1-cts-dev am: 756d41c69c"