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

Change-Id: Id32d1743813b43fbb4687f02ed6e635d227dc87d