Merge "Added skip delays when activating user id device affinities" into udc-qpr-dev am: 6a5ba0b1

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



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