Don't enable SIM PIN Lock menu if SIM is not available

Bug: 5774681
Change-Id: I1edd1447ff83ab8cf9e8a1eb8fbd85ef0becdce7
merge in ics-mr1-release history after reset to ics-mr1
Android OS battery usage overstated by screen on time

Change-Id: Icbc4b3ecf91bdbb90da3ee0cf1c68bec953d0177
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Merge "Android OS battery usage overstated by screen on time" into ics-mr1
merge in ics-mr1-release history after reset to ics-mr1
Fix 4560303: Add setting to lock later when power button pressed

This adds a feature to delay locking the device when the power button
is pressed.  This fixes a use case where the user wants to turn off
the display (e.g. to save power) but doesn't want to lock the device.

Change-Id: I711a81c3e79f7accdc1d9cb217b7806a0b8fcf63
Don't allow wifi tethering when running monkeys.

Bug: 5607825

Remove the wifi access point settings and wifi tethering checkbox when
monkeys are running.

Change-Id: I64b930ddb791013a08c178561fe29130f1f0e4b8
Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
merge in ics-mr1-release history after reset to ics-mr1
Locale string comparisons must ignore case.

The spec does not specify case sensitivity and support
for 3 letter locales is currently poor.

bug:5885830
Change-Id: I1b8f582bd19b1b0aed220036c5f17904478dba46
Fix a pseudo race condition in TtsEngineSettingsFragment.

The issue is that Fragment.setVoiceDataDetails can
be called before Fragment.getView. We guard against this
issue. No thread visibility issues here because both functions
are called on the UI thread.

bug:5884355
Change-Id: Iad91b91c58b04dcb9f34f6b5ff8752f2e8295423
Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1
merge in ics-mr1-release history after reset to ics-mr1
Import translations. DO NOT MERGE

Change-Id: Icbeee105c69fdde9ca3b07350a48318bdc3d9d3a
Import translations. DO NOT MERGE

Change-Id: I5cc127e96d61d678d51daf4515bbbda0e9068382
merge in ics-mr1-release history after reset to ics-mr1
Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.

Bug: 6079494

(cherry picked from commit 5fb53f36cb77c3d924b3fe5c305ce7d082ecdfb8)

Change-Id: Ia0d3a638f93c7c7923ce6e85f3555af0aeda96f9
merge in ics-mr1-release history after reset to ics-mr1
Bluetooth: Update Bluetooth device availability status message properly

In an out bound OPP transfer, when a device is selected from the device
picker through Gallery app, there is message "No nearby Bluetooth devices
were found" is shown though we had a list of device(s) and the device is
selected from the list. The change checks the status and updates the
message properly.

(cherry picked from commit fa647b997d9a4e57e406f2b654aac30d2347a2e1)

Change-Id: Ic318da85e74dc19a74c06f1b90cad954380ec197
CRs-fixed: 342902
Settings/Bluetooth: Changes to avoid remove profiles on UUID update.

The SDP response for OPP transport is missing the Headset UUID . This
behavior is with some particular carkits. The change is to avoid delete
profiles that are already added for a device based on UUID update response.

CRs-Fixed: 333984

(cherry picked from commit deeb2bf897d4acaedbbf420326185cb9c92d7499)

Change-Id: I050a20112b333299411d49a70a0d0777690a2cb2