Snap for 4379964 from 53335e2b1bba212b5f956dd730d5ff845c330853 to oreo-cts-release

Change-Id: I179c64967fb36e59963be58084d3fbc04b75cf93