[automerger skipped] Cherry-pick Ravenwood "core" code am: 98346163 am: def5b9f4 -s ours

am skip reason: Merged-In I8a9b8374be3ae052ba4f152eb43af20d0871597f with SHA-1 43ad4a46 is already in history

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



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