Merge "- Enable Android API to allow disabling of framework backup scheduling"