Android o preview 4
Merge "Power sub state and CON_DISC_PARAM seqence update."