Merge "Don't return hidden subscription in getActiveSubscriptionInfoList." am: 8cbe957dba
am: 6dc894e962

Change-Id: Idc50eab22bc89207868349a96dfbc38783125165