Merge changes from topic "cr-sysprop-fixed" into main am: 53ac28eafa

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

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