Merge "Merge "Bring home to front behind assistant stack when needed." into oc-dr1-dev am: 0a3684eb45 am: a58a7bf458" into oc-mr1-dev-plus-aosp
am: 5f57b53fa8

Change-Id: I7983d17469d772becd7f4698146f69a11378df70