Merge "Make FileUtils#createDir threadsafe" am: 5232082243 am: bc1b11029b am: 5c1ad2c60d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89d4a57963e75c0a6000f1f1a9a266b22e28be94