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

Change-Id: I51e07f5530de347c1976eb8b2dd4b0a7ea4114fd