[automerger skipped] Merge "Add a timeout for all installd operations." am:...

[automerger skipped] Merge "Add a timeout for all installd operations." am: 9fc78a40 am: bd236aa3 am: 9b191aef -s ours am: 3094fcd7 -s ours

am skip reason: Merged-In I6c25e1df756ca486de1c8611185dbedf60d7cd7d with SHA-1 495142ac is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1993670

Change-Id: If68156ffe19a84791b05f80db4e2231383de078a