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

Change-Id: Ic4c3726146136835ee78c82020a0c4f773033310