Merge "Detect support in ActivityManagerDockedStackTests." into oc-dev
am: 77c1bab4bc

Change-Id: I37f65912c8fb17d6e1f4d905281cf77488b379c9