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

Change-Id: I4b397dc03e24a4ee553b6b42256daad309d9d8fd