Merge "[Ravenwood] Several minor fixes" into main am: 0d42cb57

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



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