[automerger skipped] Have proper permission check in getConfigForSubId am: 8a1a592a66
am: c0be422e7f  -s ours

Change-Id: I27795f925ec1f5e7227c676264094379119acc0b