tree c5ede31bd0e9116176c0f234f130a83cb49e551e
parent af3cdce9287dec12d2424cd0c42821fbd64ee4ee
parent 761e51482d7e3e38fc15ec37fd4daab2cab9ce5f
author Mark Chien <markchien@google.com> 1550031764 -0800
committer android-build-merger <android-build-merger@google.com> 1550031764 -0800

Merge "Support multi-SIM entitlement check" am: 8fee3dee71
am: 761e51482d

Change-Id: Ifd5cd819311f2901f4d344121b4cf5a9ab6a6118