Merge "Add profcollectd to the shell group" am: 705fcfbb35 am: cb7b5d7958

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1883776

Change-Id: Id01a559adf9bbed1ab35a24c7248467affd8eee9