[automerger skipped] Merge "Adding a timeout for active-unlock" into tm-dev...

[automerger skipped] Merge "Adding a timeout for active-unlock" into tm-dev am: 4207fcf3 am: fae22f0b -s ours

am skip reason: Merged-In Ia0ccf7ecc9dacf9f4a7a913c7fce8532e6a1ece1 with SHA-1 57e69442 is already in history

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

Change-Id: I37ca2f3429802a23414963fcf829b293bf754c65