Merge "Another attempt to workaround the glitch in unknown source test" into oreo-cts-dev am: dd80c28743
am: 02e5b3e802

Change-Id: Ia496ffddb6d3d4649a8385bfa347cc84131f5e9f