Merge "App Standby Settings key is set incorrectly" into pie-cts-dev am: 8f74ba97f8
am: 624c0f9a0f

Change-Id: I8976ba1a9f16020b538d8c546f7c042ffe81e172