Cherry-pick Ravenwood "core" code am: 983461633b

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

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