Merge changes I0daebc18,I87df46d1 am: b438f33e52

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1788708

Change-Id: I8819578e8aa2432677cc80766dc910f775eddbe6
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 287dd48..6f5f70d 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -124,6 +124,7 @@
     { "aidl",       "AIDL calls",               ATRACE_TAG_AIDL, { } },
     { "nnapi",      "NNAPI",                    ATRACE_TAG_NNAPI, { } },
     { "rro",        "Runtime Resource Overlay", ATRACE_TAG_RRO, { } },
+    { "sysprop",    "System Property",          ATRACE_TAG_SYSPROP, { } },
     { k_coreServiceCategory, "Core services", 0, { } },
     { k_pdxServiceCategory, "PDX services", 0, { } },
     { "sched",      "CPU Scheduling",   0, {