Merge "Fix a misleading warning message about sysprop overriding" am: 6c7b75b421 am: 1adcea5c84

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1331393

Change-Id: If339409849da2088951a0379b7a9bb284b7d56b3