[automerger skipped] Merge "Added skip delays when activating user id device...

[automerger skipped] Merge "Added skip delays when activating user id device affinities" into udc-qpr-dev am: 6a5ba0b1 am: 4d37a79a -s ours

am skip reason: Merged-In I000369822c82ac38ff7008fafab8bc569bd762a2 with SHA-1 29956555 is already in history

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



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