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

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

Change-Id: I37d163f8bdfb786287a501f99e9af4e3bbfe2dd1