[automerger skipped] Merge "Have proper permission check in getConfigForSubId" am: c14a4be799  -s ours
am: a28ae4d9af  -s ours

Change-Id: Ib8966bb8bf0cfd03e4741f976a9201cfc2794d66