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

am skip reason: Merged-In Ia0ccf7ecc9dacf9f4a7a913c7fce8532e6a1ece1 with SHA-1 2410cfc0 is already in history

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

Change-Id: Ica362cc5fbb57656f35e3f9c000298bf8de4bef5