[automerger skipped] Have proper permission check in getConfigForSubId am: 9afe59bf1c  -s ours am: 968ad4f6e7  -s ours
am: 334317eaf1  -s ours

Change-Id: Id8309502467430c062e2da021b82125a63b242a9