Merge tag 'android-5.0.2_r1' into merge_branch

Android 5.0.2 release 1

* tag 'android-5.0.2_r1':
  Fix bad alarm delivery
  Tune delivery and batching of alarms
  Properly recognize repeating wakeup alarms
  Be increasingly aggressive about fstrim if it isn't being run
  Start MountService before performBootDexOpt
  Fix null handling in proxies.
  Setting ADB_ENABLED may result in a SecurityException.
  Add configuration to control converting sms destination number
  Increases the falsing threshold when for the keyguard affordances
  Import translations. DO NOT MERGE
  Recover apps with malformed certificates.
  Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)
  [DO NOT MERGE] Increase min free levels for cached processes on 64bit
  DO NOT MERGE: Don't log passwords returned from vdc
  DO NOT MERGE: Don't log passwords returned from vdc

Conflicts:
	core/res/res/values-mcc310-mnc004/config.xml
	core/res/res/values-mcc311-mnc480/config.xml
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml

Change-Id: Iae9bdddb80e0101b4465f7bc55002bf9d35340b6