Merge "Explicit cast from android::Base::Errno to status_t" am: 61ca5d7c56 am: b09f0dd179

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

Change-Id: I276ecc657f23047988e1f2280b3281947dfe1d05