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

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

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



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