Merge "Added test coverage to Context.startActivityAsUser" into qt-dev
am: 471a664375

Change-Id: Ifbed2659b088b72bba4d9d80d87f0d4762d4bba8