Merge "AOD: Add metrics constant for Ambient display settings"