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

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



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