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" into nyc-mr1-dev
am: 836fb6e0f0

Change-Id: I99b2c76df12a32ca1d2b298d8b2f108f99a7879b