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

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

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