Merge "Restore AOD after SysUI Restart." into tm-qpr-dev