Merge "Reduce locking during IO heavy operations." into udc-dev am: c595199741

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

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