am 3ee0cad5: DO NOT MERGE Workaround for KeyguardLock problem

Merge commit '3ee0cad5f5e21a24dbe43d21afaac1dd76a2059b' into froyo-plus-aosp

* commit '3ee0cad5f5e21a24dbe43d21afaac1dd76a2059b':
  DO NOT MERGE Workaround for KeyguardLock problem
merge from froyo-plus-aosp

Change-Id: Ibbc09c6cacf9d0f06ff88eec0fcf3a245e2e2535
am e70f4e74: merge from froyo-plus-aosp
am be21f272: am 8cfeacdc: Import revised translations
am 45f86bbb: am be21f272: am 8cfeacdc: Import revised translations
Work around problem w/ large CalendarProvider2 transactions

* We're seeing binder transaction failures when we try to send more than around
  1500 CPO's to CalendarProvider2 in a batch (the limit is related to memory
  usage in binder transactions)
* When an event has A attendees and E exceptions in an event, we currently must
  create A*E CPO's; this number can become very large and cause a binder failure
* The result of a failure is looping behavior, resulting in failed sync and very
  much reduced battery life
* The workaround here is to redact all non-organizer and non-user attendees from
  exceptions once we reach half of the maximum number of CPO's.  This has been
  determined empirically and is set to 500 CPO's in this CL
* We also reduce our sync "window" to 4 calendar/contact items per sync command
  to help limit the potential size of our batch
* For later releases, we should reconsider this and see if something that is more
  of a "fix", rather than a workaround, can be implemented

Bug: 2760514
Change-Id: I2941b392ae1058a9ead8a79f0ac73f4eb345917d
Merge (-sours) commit '5c34594dba238d2021996ee3dbea7312ee03b290' into oxygen_1006

* commit '5c34594dba238d2021996ee3dbea7312ee03b290':
  Work around problem w/ large CalendarProvider2 transactions