Merge "Fix two ActivityManagerTests when no Home Screen is present" into nougat-mr1-cts-dev