Merge "Use non-breaking hyphen for "Wi-Fi""
App ops: Support neighboring cells, call phone, improve UI.

Change-Id: I0783c7ae941499cf9847bcf657141c3aea76f59d
App ops: improve presentation.

Change-Id: Ia8702f9421a2cf2e27e8e24bfdc596321ace515a
Merge "Settings: Add setting to clear adb public keys"
Fix Settings app crash after enabled multi-user

Bug: 8128225
Change-Id: I2918a5ec36e861a1ce4b2e67cf7607929732a7bf
Import translations. DO NOT MERGE

Change-Id: I6091aef5f86bfdc58cfe83f15e1292e7d86339dd
Auto-generated-cl: translation import
fix an issue where sensors power usage wasn't reported properly

the battery service records a sensor's *handle*, but the
PowerUsageSummary code used it as a sensor *type*.

Change-Id: I0d2cbdffc24238d5e02f0d6369fa44ed990176a4
Improve error message to figure out which fragment class is problematic.

Bug: 8057867
Change-Id: I6ad0bc8c8a6ed9bc8a1cca5debffe15c6de3a1b5
Merge "Improve error message to figure out which fragment class is problematic."
App ops: add UI for SMS ops.

Change-Id: I595df9a286ba5389f9e309516dc4a8ab34773277
Merge "Import translations. DO NOT MERGE"
Merge "fix an issue where sensors power usage wasn't reported properly"
App ops: add modify settings op.

Change-Id: I7aab6c7f565a20fe24156956895a7db20c8d3aaa
Merge "App ops: add modify settings op."
wifiSettings: Updating the networkinfo on supplicant event

In framework we update the networkId on supplicant state change
these changes in the network info should be reflected in settings.
there by updating the networkinfo.
The problem we are facing without this fix is when we have single
saved AP profile Switching off the AP when we are in connecting
tate resulting in a behavior Where UI keep showing connecting
to that AP instead of showing it as out of range.

Change-Id: I04073b9a4068f4b75216ebfd431adc126583f15c
Update theme of ActivityPicker

Bug: 7971340
Merge "wifiSettings: Updating the networkinfo on supplicant event"
am 203631b2: Merge "wifiSettings: Updating the networkinfo on supplicant event"

# By sunil duttu
# Via Gerrit Code Review (1) and sunil duttu (1)
* commit '203631b24cd3947bcba2ab24789e4cfec487eff7':
  wifiSettings: Updating the networkinfo on supplicant event
am 6639dee4: am 203631b2: Merge "wifiSettings: Updating the networkinfo on supplicant event"

# By sunil duttu
# Via Android Git Automerger (1) and others
* commit '6639dee497304c359141caf9b0452699a6d64aa9':
  wifiSettings: Updating the networkinfo on supplicant event
P2PSetting:Avoid p2p_find on group removal event

Immediately after group termination p2p_find is being issued
from settings and this causing issue whenever user sends
connection request immediately after group_removal_event.

Change-Id: I41e5f520f7d9475d0ec890d40eea172d9d66d06e