Merge "Remove spammy convertToModernFd log" into sc-dev am: eac1d5a41c am: 988b01f450

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

Change-Id: Icc8a129d7385eddfd1d17a6af430c40a3e891433