Resolve uid and gid conflicts between rma_fw_keeper and usb_bouncer

Both of them were using the uid/gid 20124. Increment the id of
rma_fw_keeper to 20125.

BUG=None
TEST=build image and check /etc/passwd and /etc/group

Change-Id: I68eac0b0f892433b3f4d8e9b4c5aaa19e7e16b34
Reviewed-on: https://chromium-review.googlesource.com/c/1371346
Tested-by: Wei-Cheng Xiao <garryxiao@chromium.org>
Reviewed-by: Louis Collard <louiscollard@chromium.org>
Commit-Queue: Wei-Cheng Xiao <garryxiao@chromium.org>
diff --git a/profiles/base/accounts/group/rma_fw_keeper b/profiles/base/accounts/group/rma_fw_keeper
index 0432b86..5629d05 100644
--- a/profiles/base/accounts/group/rma_fw_keeper
+++ b/profiles/base/accounts/group/rma_fw_keeper
@@ -1,3 +1,3 @@
 group:rma_fw_keeper
-gid:20124
+gid:20125
 users:rma_fw_keeper
diff --git a/profiles/base/accounts/user/rma_fw_keeper b/profiles/base/accounts/user/rma_fw_keeper
index ebd7856..5b0778e 100644
--- a/profiles/base/accounts/user/rma_fw_keeper
+++ b/profiles/base/accounts/user/rma_fw_keeper
@@ -1,6 +1,6 @@
 user:rma_fw_keeper
-uid:20124
-gid:20124
+uid:20125
+gid:20125
 gecos:RMA'ed device FW keeper. verify_ro in crosh runs as this user.
 home:/dev/null
 shell:/bin/false