Merge "isProviderEnabled() doesn't throw security exception on LMP+" into lmp-dev