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: 3dc1a0ac

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



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