Merge "Metrics constants for new zen screen" into pi-dev
am: 11e2010547

Change-Id: I64f092c64e35829a8beb90054d8b98226805cd8d