tree 6b3a40dfd83a7e8a4f956d829b9384e48daed005
parent 1eb9df20880e5543f86d3bb354d0ef43c48230b0
parent 851ec326d90b47f950558bc013bff419fe4caef8
author Xiangyu/Malcolm Chen <refuhoo@google.com> 1552433762 -0700
committer android-build-merger <android-build-merger@google.com> 1552433762 -0700

Merge "Don't return hidden subscription in getActiveSubIdList" am: d2cb5a0608
am: 851ec326d9

Change-Id: I9356cfd364f7a9d65c299a10d9aea37f1d3d79de