Merge "Merge "Move RevocableFileDescriptor creation outside the locked section." into rvc-dev am: 51540fe05e am: 2a30ca9e17" into rvc-d1-dev-plus-aosp