Merge "Unpin staledataclass-annotation-processor from Java 8" am: 818cc232 am: 7ef2a666

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



Change-Id: I2d911f98ada4053d58d61b1435c7a4b93bb5bc93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>