tree 45a2d13a00e6b9792a1ebe16f314e190928f7f85
parent c71c05bf6755d83f315495a59d69d75e8eee8555
parent 5046c4f4eb6c840dc7f3d80de713607351b7d906
author Xiangyu/Malcolm Chen <refuhoo@google.com> 1552433179 -0700
committer android-build-merger <android-build-merger@google.com> 1552433179 -0700

Merge "Handle hidden subscriptions for different cases." am: 80edc71e90
am: 5046c4f4eb

Change-Id: I6e75ddeb73246d277c78e3bef8872f925c2226ce