Merge "Merge "Kill foreground apps when turning off work" into nyc-dev am: 49425d6 am: 6515351" into nyc-mr1-dev-plus-aosp