Merge "Merge "Detect support in ActivityManagerDockedStackTests." into nougat-mr1-cts-dev am: 9341692aaa" am: 5cbbeef472 am: 75b5fbacf4
am: 16afa1d4ec

Change-Id: I4ea204f43424881509de886938deaba4f38deab4