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

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

Change-Id: Ia7fbdc74de136ff4140bf34adf43e472381ccfff