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

Change-Id: I3bc606975e0ced7353e9bb174da95f4edcefdb1f