Merge "Update-ability: Remove IDeviceIdleController"
am: b5110e8e12

Change-Id: Ia52620863641a61e65c13e63acebf1ae1967288b