Merge remote-tracking branch 'goog/upstream-pixel18' into pi-dev-uaf-fix
am: 1536146973

Change-Id: I1a03abac2614c0a78fd63520bc022439c876f96e