[automerger skipped] configstore: reduce restrictions in prctl() am: 8de59b93bd  -s ours am: 5938dab36f  -s ours
am: eb7c6344f3  -s ours

Change-Id: I5c81425e2f20e0760899c0fc508bc5a6fa0d5877