Merge "Merge "Another attempt to workaround the glitch in unknown source test" into oreo-cts-dev am: dd80c28743" am: d188e76c6a am: 6a799b8670
am: be228da70f

Change-Id: Idea7f18d469ca2c2c6a9686cfc1f6c103aacd269