Merge "Merge "Do not resume activities that were launched behind" into qt-dev...
Merge "Merge "Do not resume activities that were launched behind" into qt-dev am: 35885e07 am: 22fbe91c" into qt-r1-dev-plus-aosp
am: 222e207d
Change-Id: I91acc9512ba02c54d52659d730b309441f35fc32