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

Change-Id: I101aed1bd5f0e034938ae5541346f857d72dea92