[automerger skipped] Merge "Don't return hidden subscription in getActiveSubscriptionInfoList." am: 8cbe957dba am: 6dc894e962
am:1eb9df2088-s ours am skip reason: change_id I3a9f3a9a2628a8e2ad1c401f6fe5e4c5866a0047 with SHA15b16f8d92bis in history Change-Id: I4fa2131138161b96779962ef413c42b1237c29db
This commit is contained in: