Merge "Merge "Bring home to front behind assistant stack when needed." into...
Merge "Merge "Bring home to front behind assistant stack when needed." into oc-dr1-dev am: 0a3684eb am: dd72696f" into oc-mr1-dev-plus-aosp
am: 8bb510d5
Change-Id: I99fca12e0228dfa61b3629e170a40775124de56f