tree 37d5f7adca227c45aa3a6803c5db1a50b2764772
parent 5c048e610b9f83a05bec07ed38124675729cadb7
parent 55b6a78eea39f056700801f19a3ace5d19f7832c
author Jordan Liu <jminjie@google.com> 1550105626 -0800
committer android-build-merger <android-build-merger@google.com> 1550105626 -0800

Merge "Allow privileged apps to call getUiccCardsInfo" am: 35175b13b0
am: 55b6a78eea

Change-Id: I7b5ef92e9bb096174a853c03838c1145f64c533f