Merge "Unpin staledataclass-annotation-processor from Java 8" am: 818cc23210 am: 7ef2a66679 am: 78f8f9af2e am: 8b6aaf9081 am: 91b2223d19

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

Change-Id: I46f2ac2dd51d71ce7d4f1064c1519efe4aa9d512
Signed-off-by: Automerger Merge Worker <[email protected]>