Merge "adb: Open FunctionFS files with more restrictive access modes" am: f78ff013d0
am: e74b0f224c

Change-Id: I0d11be7750f0a05838ecb9b9accd02e6a0b0fb2f