Merge "Cancel future HUN lifetime extension after action press" into udc-dev...

Merge "Cancel future HUN lifetime extension after action press" into udc-dev am: c0ef9223 am: a27c861e

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



Change-Id: Iaf743a7f627b4eda220aefe0ed1406b37f18573c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>