Merge "Merge "Do not allow app to start background activity after stop app switches triggered" into qt-dev am: 02d9b9c3 am: 534529c0" into qt-r1-dev-plus-aosp
am: ee104be8

Change-Id: Ic702e4b6606a9abc5375aa710b6313d95157f6c6