tree ae1b4c94560b74b64c060891108c12566c1c0436
parent be9701bfeb85509f19c7331ff3ffa98f8108cb0d
parent 8c576fb131d01113aec1b3b87beabfb45f52a46f
author Cody Kesting <ckesting@google.com> 1613519844 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613519844 +0000

Merge "Implement Safemode alarm in VcnGatewayConnection." am: 30d9bfa03b am: 875a7d0764 am: 8c576fb131

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1577286

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1784c40cfd58b241fb7f7b27ec569f74fe14c293