Fix for Backup Services

Change-Id: I7cd572b85648bca6a7777f026be4933e7d71a9f0
Merge "Fix for Backup Services" into kitkat
Merge branch 'kitkat' of https://github.com/AOSPA/android_frameworks_base into kitkat