Fix a CTS failure and put bg_non_interactive apps in their place

Change-Id: I5fc9e823fa229e72ae72010513114331e66cc8b0