Merge "Fix the system property name in a comment" am: 16f7bdca am: 75a7f794

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



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