[automerger skipped] Merge "Add systrace tag for system property" into...

[automerger skipped] Merge "Add systrace tag for system property" into rvc-dev-plus-aosp am: baaf7f85 am: 21e09283 am: c02befec -s ours

am skip reason: Change-Id Id78992d238a73257bb9b80bfaa6bbfeb16f477d8 with SHA-1 98d0d4ba is in history

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

Change-Id: I443fdda541abcbfcdf3815a8635e696dafca9e29