Merge "Caching result of call to ActivityManager.isRunningInTestHarness()" into main