Merge "Merge "Move RevocableFileDescriptor creation outside the locked section." into rvc-dev am: 51540fe0 am: 2a30ca9e" into rvc-d1-dev-plus-aosp am: 3f67c4c4 am: f1cba5ba

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

Change-Id: I7a605a7a1498db1208ee97354a430d92a228b06c