Merge "Include Wear device idle settings am: 1ac3a1f3fc"
am: afae7a6e23

Change-Id: Ief16fa1d0029f9e60c59b3d551f6fe7b27528a17