Merge "Make ScopedFileDescriptor default ctor implicit" am: 084e1948ae am: 37e8aa52e8

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1485444

Change-Id: I8f528401f4921cf51a7e0106e86f62b138ffc696