Merge "Merge "Move RevocableFileDescriptor creation outside the locked section." into rvc-dev am: 51540fe0 am: 5a78574e am: 93fa5e4a" into rvc-qpr-dev-plus-aosp am: 57cbc128

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

Change-Id: I6e1a141a35dce9be47eb487772203efd9906916a