Snap for 4726689 from 9d66948caaf607cca2d5631b80de813e241953a8 to oreo-mr1-cts-release

Change-Id: I5c16a88584c385fe96b157ce08c819d21cceea31