Merge "Merge "disable 2 tests in ActivityManagerPinnedStackTests" into nougat-cts-dev am: 87c2fa50e9" into nougat-mr1-cts-dev