Merge "[VCN09] Rename linger timer" am: fb2c686fb1 am: 93de6ea9ad am: 23728382ea

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33c7298e0fbc67e4461363f9371f496bf12f5c4c