Merge "Make FileUtils#createDir threadsafe" am: 5232082243

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6449b55a42994f8c35854bbe698ad2c697ab0244