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

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

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