Merge "Fix issue where SIM PIN message would be visible am: 00ce73a4 am:...
Merge "Fix issue where SIM PIN message would be visible am: 00ce73a4 am: 8bf6e361" into qt-qpr1-dev-plus-aosp
am: 7011e368
Change-Id: I3758d46bbd87a023a92910e645e030ce80131dfe