Merge "Fix two ActivityManagerTests when no Home Screen is present" into nougat-mr1-cts-dev am: ce4eb5f475 am: 36c20f1bb0 am: 487535999a
am: 69dd13afe6

Change-Id: I70e10bc6d12b114c4d0ab41917956b851a956a33