Merge "Fix the use of pdfium" into rvc-dev am: d5f905df8f am: 3e8631a569

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

Change-Id: I6eec92d08158d68fffdb0860135f87aff2fe466d