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

Change-Id: Iaf5a040d88a25ed52c6c0333e7cd64f0cc702c6e