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

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



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