Merge "profcollect: Use DeviceConfig to control trace parameters" am: be52daface am: 1bd94db820

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

Change-Id: Ib1f746e3fe41043b09091b773a2153e842ed2197