Merge "Replace hidden getFileDescriptor$()" am: 842319b819 am: 4b2d4e4e3b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id15d49eb46923d3d5c0433babeceea9fec21386c