Merge "Added temporary-lockout timer support" into udc-qpr-dev am: 27c07e6b

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24324121



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