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

Change-Id: Ifff573d643027409e60a241cfac5f8affd395c69