Merge "Remove spammy convertToModernFd log" into sc-dev am: eac1d5a4 am: 86acac46 am: 46a2b968

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

Change-Id: I7e2b7adc9ee2a4be68f7529c2ee4049cf7bdbfdd