[automerger skipped] profcollectd: Rename config env to persist.* am: b6bb23ce27 am: 790ac8d3b2 am: bdf21de769 am: 99e8bf8ddb am: 0d3c868631 -s ours
am skip reason: Change-Id I7e437c3df425ff0f604d24502d49a15050b5279d with SHA-1 0b7cedd240 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425269
Change-Id: Ib9dfce76f8ba38358b7bc4881f8b19ddc13ea601
This commit is contained in: