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 am: e92e1bda

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



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