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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2290180e6891e9f568140ecf9e79dd9b237e06bd