Merge "Fix a misleading warning message about sysprop overriding" am:...

Merge "Fix a misleading warning message about sysprop overriding" am: 6c7b75b4 am: 1adcea5c am: 3a1b4a87 am: e8c1dbd3

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

Change-Id: I64ffc52c5a83a5e14e73a1698260cbf7868f725b