[automerger skipped] Have proper permission check in getConfigForSubId am: 05ab439039
am: a381636bd4  -s ours

Change-Id: Ib865cff9db59bce41a5d6ef950682469adfa9217