Merge "Remove jdiff_enabled from platform metalava runs" am: 02ca5fcbe7 am: 0e45be9aa5

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

Change-Id: Iaba3b83fc0302952408f30bec5f255976510369f